From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 9 Feb 2024 06:28:50 +0000 (+0000)
Subject: Hack broken rust target selection so it produces the right target on raspbian.
X-Git-Tag: archive/raspbian/115.9.1esr-1_deb12u1+rpi1~9
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6a4afa041034da4ed74137c7265af5334e18439e;p=firefox-esr.git

Hack broken rust target selection so it produces the right target on raspbian.


Gbp-Pq: Name raspbian-rust-triplet-hack.patch
---

diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
index 7a2fd1ae706..ff8fce68d90 100644
--- a/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@ -258,9 +258,14 @@ def rust_compiler(rustc_info, cargo_info, target):
 
 
 @depends(rustc, when=rust_compiler)
+@imports("sys")
+@imports(_from="__builtin__", _import='repr')
 @imports(_from="__builtin__", _import="ValueError")
 def rust_supported_targets(rustc):
+    #HACK: if there are multiple matches the algorithm uses the last one
+    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
     out = check_cmd_output(rustc, "--print", "target-list").splitlines()
+    out.append("arm-unknown-linux-gnueabihf")
     data = {}
     for t in out:
         try: